From 84314637afc540bd07aa25a64168246f505ecb38 Mon Sep 17 00:00:00 2001
From: Andrey Rijov <rdron@users.sourceforge.net>
Date: Sun, 11 Sep 2011 23:33:34 +0400
Subject: [PATCH 3/7] Some bug fixes

---
 Create_HDD_Image_Window.ui |    2 +-
 Main_Window.cpp            |    3 ---
 System_Info.cpp            |    2 ++
 Utils.cpp                  |    8 ++++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Create_HDD_Image_Window.ui b/Create_HDD_Image_Window.ui
index 030d025..7d21b9b 100644
--- a/Create_HDD_Image_Window.ui
+++ b/Create_HDD_Image_Window.ui
@@ -175,7 +175,7 @@
         <double>1.000000000000000</double>
        </property>
        <property name="maximum">
-        <double>1024.000000000000000</double>
+        <double>9999.000000000000000</double>
        </property>
        <property name="singleStep">
         <double>1.000000000000000</double>
diff --git a/Main_Window.cpp b/Main_Window.cpp
index f8cb244..5a8ed7e 100644
--- a/Main_Window.cpp
+++ b/Main_Window.cpp
@@ -5654,7 +5654,6 @@ void Main_Window::on_TB_HDB_Format_HDD_clicked()
 	
 	hdd_win->Set_Image_File_Name( ui.Edit_HDB_Image_Path->text() );
 	hdd_win->Set_Image_Info( HDB_Info->Get_Disk_Info() );
-	hdd_win->exec();
 	
 	if( hdd_win->exec() == QDialog::Accepted )
 		HDB_Info->Update_Disk_Info( ui.Edit_HDB_Image_Path->text() );
@@ -5739,7 +5738,6 @@ void Main_Window::on_TB_HDC_Format_HDD_clicked()
 	
 	hdd_win->Set_Image_File_Name( ui.Edit_HDC_Image_Path->text() );
 	hdd_win->Set_Image_Info( HDC_Info->Get_Disk_Info() );
-	hdd_win->exec();
 	
 	if( hdd_win->exec() == QDialog::Accepted )
 		HDC_Info->Update_Disk_Info( ui.Edit_HDC_Image_Path->text() );
@@ -5824,7 +5822,6 @@ void Main_Window::on_TB_HDD_Format_HDD_clicked()
 	
 	hdd_win->Set_Image_File_Name( ui.Edit_HDD_Image_Path->text() );
 	hdd_win->Set_Image_Info( HDD_Info->Get_Disk_Info() );
-	hdd_win->exec();
 	
 	if( hdd_win->exec() == QDialog::Accepted )
 		HDD_Info->Update_Disk_Info( ui.Edit_HDD_Image_Path->text() );
diff --git a/System_Info.cpp b/System_Info.cpp
index 32ca029..d6d44dd 100644
--- a/System_Info.cpp
+++ b/System_Info.cpp
@@ -2394,6 +2394,8 @@ Available_Devices System_Info::Get_Emulator_Info( const QString &path, bool *ok,
 		
 		// Get all models string
 		QString all_models = tmp.mid( tmp.indexOf("models:") + QString("models:").count(), tmp.count() );
+		all_models.remove( QChar(' ') ); // Remove all spaces
+		
 		QStringList net_cards_models = all_models.split( ',', QString::SkipEmptyParts );
 		
 		if( net_cards_models.isEmpty() )
diff --git a/Utils.cpp b/Utils.cpp
index f9e9bc3..36ec8d4 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -220,19 +220,19 @@ bool Create_New_HDD_Image( bool encrypted, const QString &base_image,
 	args << "-f" << format;
 	
 	args << file_name;
-	 
+	
 	switch( size.Suffix )
 	{
 		case VM::Size_Suf_Mb: // MB
-			args << QString::number( (long)(size.Size * 1024) );
+			args << QString::number( size.Size ) + "M";
 			break;
 			
 		case VM::Size_Suf_Gb: // GB
-			args << QString::number( (long)(size.Size * 1024) ) + "M";
+			args << QString::number( size.Size ) + "G";
 			break;
 			
 		default: // KG
-			args << QString::number( (long)size.Size );
+			args << QString::number( size.Size );
 			break;
 	}
 	
-- 
1.7.8.3

